-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Sync latest-candidate to 5.21-edge (5.21-edge) #647
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's a fix for a build failure on s390: Installing build-packages Cannot find package listed in 'build-packages': acpica-tools Full execution log: '/root/.local/state/snapcraft/log/snapcraft-20240621-073250.087743.log' Build failed Reason is that, in Ubuntu 24.04 acpica-tools package is not available for s390: https://packages.ubuntu.com/noble/acpica-tools compare with: https://packages.ubuntu.com/jammy/acpica-tools Let's workaround this by preventing build packages installation for any architectures other than amd64/arm64. It's safe, because we only build edk2 for these two architectures. Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit a0e011e) (cherry picked from commit 8d8f8f4)
snapcraft syntax a little bit unobvious, and it turned out that: - on amd64,arm64: means AND and not OR. Which is obviously wrong. Let's workaround this. Fixes: a0e011e ("snapcraft: install edk2 build dependencies only when needed") Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit b57a131) (cherry picked from commit 712aad5)
Only for core24. Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit 5910450) (cherry picked from commit 9c5f5f2)
Signed-off-by: Alexander Mikhalitsyn <[email protected]> (cherry picked from commit dacdab2) (cherry picked from commit 56cebc0)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 0eb7b80) (cherry picked from commit ee8ea0e)
…Device Interface spec generation Signed-off-by: Gabriel Mougard <[email protected]> (cherry picked from commit 2b7129f) (cherry picked from commit a787d81)
Signed-off-by: Kadin Sayani <[email protected]> (cherry picked from commit bf88064) (cherry picked from commit 335da20)
This is merely cosmetic/for logical correctness as the end result is the same. Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit f2c08e2) (cherry picked from commit 1bb52fc)
Signed-off-by: Kadin Sayani <[email protected]> (cherry picked from commit 245e9e1) (cherry picked from commit 28a3e19)
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit 30a24f3) (cherry picked from commit 7028637)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit d320669) (cherry picked from commit ae55cae)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit b3a2abe) (cherry picked from commit 2aaa937)
This is in preparation for it being used as a container stop hook helper to allow it to be called across snap base changes without depending in libs from the core snaps. Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit 2c18445) (cherry picked from commit a762038)
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit 6a1f4c2) (cherry picked from commit 9794f7b)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit dec20d9) (cherry picked from commit fc454f3)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 4632170) (cherry picked from commit f579ab7)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 9e84fc5) (cherry picked from commit f0677f6)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 236d626) (cherry picked from commit 4af31f3)
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@eef6144...11bd719) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> (cherry picked from commit 35ef0ce) (cherry picked from commit 722ead6)
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.2 to 5.1.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@0a12ed9...41dfa10) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> (cherry picked from commit 2b51aa3) (cherry picked from commit 8e42500)
Also drop `g` flag as those `key = value` only occur once per line anyway. Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 35b74b3) (cherry picked from commit 8be31ec)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit b773a48) (cherry picked from commit f1cf00a)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 98f2c84) (cherry picked from commit cca1852)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit f31dbaf) (cherry picked from commit 878ed1f)
…touched Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit ec03f70) (cherry picked from commit dd19380)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit eeffd46) (cherry picked from commit eaa6524)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 95e33ae) (cherry picked from commit 114c956)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 174523d) (cherry picked from commit cd59702)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 513cd24) (cherry picked from commit e6aa23a)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit a7099ab) (cherry picked from commit 792e1ac)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit f0a2d8f) (cherry picked from commit 284f9c3)
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit febb44f) (cherry picked from commit a3bc459)
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit 2be63e5) (cherry picked from commit 33e295b)
Signed-off-by: Din Music <[email protected]> (cherry picked from commit bb62212) (cherry picked from commit 8b510d2)
This command is intended to replace the `lxd` command in the snap so that existing running containers that are stopping will call this script as part of their stop hooks. This will then "route" the command to the `lxd-user` command that will be statically compiled so that it can connect to the running LXD daemon via the unix socket to indicate the container is stopping, even after refreshing the LXD snap to a different core base snap. Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit 4d10cbd) (cherry picked from commit d037e01) (cherry picked from commit 65fdfd4)
The PATH inside the snap is configured to prefer /sbin over /bin so the lxd binary will still be called by default. The lxd-stophook-wrapper script which will be placed into `/bin/lxd`. Because containers are configured to call `/snap/lxd/current/bin/lxd callhook` which in turn will be routed to `/snap/lxd/current/bin/lxd-user` by the lxd-stophook-wrapper script, which will then connect to LXD's unix socket to indicate to the server that the container is stopping. Because lxd-user is compiled as a static binary this will work across snap core base changes. Also update LXD_EXEC_PATH env var so that LXD will still directly execute itself when needed, rather than going via the lxd-stophook wrapper script. Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit 75de117) (cherry picked from commit 74e8bc7) (cherry picked from commit 2419b14)
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit c896203) (cherry picked from commit 0ff5b62)
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit e5a1296)
Signed-off-by: Thomas Parrott <[email protected]> (cherry picked from commit c0b8a0d) (cherry picked from commit 94ad1d9)
Reported-by: Kadin Sayani <[email protected]> Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit d51c247)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 55c4560)
Signed-off-by: Simon Deziel <[email protected]> (cherry picked from commit 4d61d1c) Signed-off-by: Thomas Parrott <[email protected]>
Signed-off-by: Thomas Parrott <[email protected]>
Signed-off-by: Thomas Parrott <[email protected]>
Signed-off-by: Thomas Parrott <[email protected]>
simondeziel
approved these changes
Dec 12, 2024
Comment on lines
+290
to
+291
git config user.email "[email protected]" | ||
git config user.name "LXD snap builder" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unneeded as we don't do any cherry-picking or such, but also harmless.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, yeah was trying to sync as much as possible.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As part of the pre-LXD 5.21.3 release preparations I am syncing the snap changes from latest-candidate (6.2) into 5.21-edge, and then will sync to 5.21-candidate.